cfi_flash: precision and underflow problem in tout calculation

With old configuration it could happen tout=0 if CONFIG_SYS_HZ<1000.

Signed-off-by: Renato Andreola <[email protected]>
Signed-off-by: Alessandro Rubini <[email protected]>
Signed-off-by: Thomas Chou <[email protected]>
Signed-off-by: Stefan Roese <[email protected]>

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index fdba297c88b075cbc098b6a92fa474a2f8c54d65..cd1a86ebad27c734a2e1d99705dae8196d7f9c43 100644 (file)
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -537,7 +537,10 @@ static int flash_status_check (flash_info_t * info, flash_sect_t sector,
        ulong start;
 
 #if CONFIG_SYS_HZ != 1000
-       tout *= CONFIG_SYS_HZ/1000;
+       if ((ulong)CONFIG_SYS_HZ > 100000)
+               tout *= (ulong)CONFIG_SYS_HZ / 1000;  /* for a big HZ, avoid overflow */
+       else
+               tout = DIV_ROUND_UP(tout * (ulong)CONFIG_SYS_HZ, 1000);
 #endif
 
        /* Wait for command completion */